This reverts commit 163cb987. Reason for revert: b/257407201 Change-Id: I412140117d25f4a4b439fff5aaa50785f33b0689