[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: 567ec866ad -s ours am: c7dd81ecac -s ours am: 6710d8fa3a -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history
Change-Id: Ic3f73a978b393791f6aadded539d759a6fc276be
This commit is contained in: