Reconcile with jb-mr1-release - do not merge

Change-Id: I88c2557df84b57e8b5347585ad425b3780c298a5
tree: a9094d9d77ff885aa724de0a2879221fa8579152
  1. PermissionController/