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: a5d98cd4
Change-Id: I210b44a9da1fb45ac1442d63eb3e828bb261b25f