Merge "Do not reset runtime permissions on upgrade" into mnc-dev