Merge "Merge "Protect against NPE" into rvc-dev am: 7f572a5a76 am: c2cddfd3b4 am: 19a09aea55" into rvc-qpr-dev-plus-aosp