[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e55 am:...
[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e55 am: 007bff06 am: 3a52d0f7 am: c0c2991f -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 1c48f85a is in history
Change-Id: Ia8eeaafb958eeaf50cf3a6f57a6f9391a7b6e3d3