[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: fe7e08f6ea -s ours am: 0800017588 -s ours am: 71e8627978 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history
Change-Id: Ib4184c7f96c73bbcdf96c28251321c29af633e12
This commit is contained in: