Merge "Changes for access control." into ics-mr1