Merge "Reset any non-runtime permissions with user sensitive" into rvc-dev am: 5db9071c42 am: 40ee4c4947

Change-Id: Iad5ed43ff9c7a3d3f440e2add2dd4c1e8744fbb7