Bug: 31455788 Fails on target. This reverts commit d43e872b. Change-Id: I7fefa1c075d654b8a0196b518bd33e4058f9a831