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