Merge "Don't run failing 'other user' test pre-R" into rvc-dev am: 4f445cfc6d am: 9bc65efd97

Change-Id: Ia7b45cab0e3e3f5f12770406f94badf210911617