am 34059a91: am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1

* commit '34059a912520e6c145f18373c4300e4a567da89d':
  Changes for access control.