Merge "Fix possible NPE" into rvc-dev am: 1d63b6c88a am: 1f4ff81284 am: 71c36ad7ec
Change-Id: I81abd2140f23444eb5ed12b8787eba714ab159be
This commit is contained in:
1d63b6c88a am: 1f4ff81284 am: 71c36ad7ec
Change-Id: I81abd2140f23444eb5ed12b8787eba714ab159be