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