This reverts commit fc3bb5c8. The test is now fixed. Bug: 28826195 Change-Id: I2fb9bb5250f834f8535ec392a209cbc84de8781c