Merge "Reset any non-runtime permissions with user sensitive" into rvc-dev am: 5db9071c am: 76251f71 am: de76ad07 Change-Id: I5129a2930f18bef9d8f0bcc7a3e16beda3b372b4