Tests fail on device. This reverts commit c60f75d6. Change-Id: I2d8f919df154b700854d78993c460e3aab7cf0c3