Merge "Resolve most remaining STOPSHIP comments for role." into qt-dev am: c85ace2da0 am: 64b336e457
am: f7416c6ff6

Change-Id: I3db97dcb0436a1f98324a2a7834044e8e288c54b
tree: 829dad98295fca255d0c884bc33733837687cc00
  1. PermissionController/