Merge changes from topic 'am-c8047f96f07944c8b3ca4ebb50d15c8c'

* changes:
  Merge changes from topic 'n1' into nougat-mr1-cts-dev am: e3054d6649
  [DO NOT MERGE] Don't allow permission change to runtime - tests am: fb8aeca2dc  -s ours