Merge "Add cross user permission checks" into oc-mr1-dev
am: 2a896e9074

Change-Id: I56cd3efc0d06af3ce877aff23a22d17f7e7a2e0d