[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: a29050fdf8 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 380318053b is in history
Change-Id: Icab560cf608837222727b6176155d96498838870
This commit is contained in: