This reverts commit 80e6d8873b. Bug: 32771832 Change-Id: Ia2f2ffd08dfd87cbce1ec750d6b61277799b536f
80e6d8873b
2d71384a13