am 48b651cb: Merge "Changes for access control." into ics-mr1

* commit '48b651cb2a3afab979c2a46185fd7edfa5424387':
  Changes for access control.