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

Change-Id: I4dae3f133c4959c9ee97e1154378d0a2ee70cbfb