Rem test that fails on some setups

Change-Id: I5e11462ac924afea6c7ef4551d139a7159872831
Merge "Rem test that fails on some setups"