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

Change-Id: I4985081f5f6e465b62f5f24f48dc03330d1b01ff