[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 93ef311226 -s ours am: 1f12fbe878 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history
Change-Id: Id6e3805ee9a49e9edc2a6a16e60c3f54ade2990a
This commit is contained in: