[DO NOT MERGE] Don't allow permission change to runtime am: fe430be9 am: 903102fa am: 33f5a3cc am: 4682420d am: 52fc40c2 Change-Id: I015615df364706be928680209135cc3f23aed8f7