Test fails. Bug: 31682382 This reverts commit ad2dc875. Change-Id: Id15d9d5478d2f72a4dc59f119944a311be7bc989