Merge "Fixing stray NPEs" into rvc-dev am: 2b97e346d6

Change-Id: I1ea75069af63b98e519a4b5a451d160259cf70fb