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