This reverts commit 2a66fc61. Reason for revert: b/174445211 Change-Id: I286327d8db19d50d3dd9602a2d0bd368d331c0c4