Merge "Don't allow permission change to runtime"