Merge "Reset any non-runtime permissions with user sensitive" into rvc-dev am: 5db9071c am: 40ee4c49 am: 1cdd05d7 Change-Id: I0757bf56bf20516a52e7bb3423fc342164203893