Merge "Handle case for missing permissions - fix NPE am: 39cc33f192 am: 6e527d0ec5 am: a2ab662f9b" into oc-mr1-dev-plus-aosp