This reverts commit 432fc04f64. Bug: 223736548 Test: make Change-Id: I242dd4677d0e42e05bed443e4021ca44cddf4daf
432fc04f64