Merge "Guard against NPE am: 663cc934d9
am: f704b4eb6d
am: a59ad6a112" into rvc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
c8b77ea7de