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: 6548f6eb am: ceb2d878 am: b0ec46f8
Change-Id: I302277b35a182f1c9e97dc3e471f7ce3b4be5f99