Merge "Merge "Handle case for missing permissions - fix NPE am: 39cc33f192 am: c200689d6c" into oc-dr1-dev-plus-aosp am: 4551bfdefb" into oc-mr1-dev-plus-aosp