Merge sc-d1-dev 6958804 into master.

Change-Id: Ib262b3dc5bdd9c04d282607b39c2d7f98d3e207f
BUG:171916167
tree: 7bfd39d4f43f3fa5496e67ee59cb297688655782
  1. PermissionController/