Merge "Revoke invidivual permissions" into oc-mr1-dev
am: 62b6b4d292

Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e