This reverts commit 00a6e527. Reason for revert: b/123237328 Change-Id: I0e38e6187760264f16f3cd00389a4e1cdb316086