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