[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history
Change-Id: Iaa695bbf4cfdb71900b6b06b62db7222a0c0019d
This commit is contained in: