[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 38fb4d2be9 -s ours am: 208b43d8ed -s ours am: c083b9438b -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 3854ed0c53 is in history
Change-Id: Ia2cadc7252162a32f988d1de9c66cb52f3e084b2
This commit is contained in: