[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: 67cdd0d1a1 am: 96f01a4f80 am: 8760b8142a -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 3854ed0c53 is in history
Change-Id: Iae2c6e1b734c56512deda4ba14b562e370be6169
This commit is contained in: