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
Change-Id: I4eb473c1759d55fb2fcc89a32b53501e0d2f625c