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

Change-Id: I2a1cd6747acdf474cf9dea7d247976eebaa9494b