Merge "Revert "Add check for cross user permission"" into rvc-dev am: ddb28a552f

Change-Id: I59be4790a62236947cd907f9eb0276b1b2e719cd