Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev