Merge "Fix NullPointerException when convernt the result from Object to...
Merge "Fix NullPointerException when convernt the result from Object to Boolean" into rvc-dev am: a74134b8 am: f33185d8 am: 94be8311
Change-Id: I08b25643b6c929d5812a04b4a82af86178dacfd6