Merge "Revert "Don't allow permission change to runtime""