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 am: 4f31e832
Change-Id: I6f4228081870557fb853bfe69f9c4abfa9b70d4d