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 am: a67932a2
Change-Id: I6c2216aeac6dc37fa14394ab022ad0a6888f5fe8