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