Merge "Guard against NPE am: 663cc934d9 am: f704b4eb6d am: a59ad6a112" into rvc-qpr-dev-plus-aosp am: c8b77ea7de
Change-Id: I25793ad07ad5b619c2fb5002d226c5e908e0bff2
This commit is contained in: