[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours am: 5559d7de74 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history
Change-Id: Icf75c23b34f91a046bf020c1b364cc05b8bb6653
This commit is contained in: