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

Change-Id: I2f2a5e3a96378e3102ef407159fb812a16a3d233