This reverts commit 3611fdf7. Bug: 123696564 Bug: 124284724 Reason for revert: b/124284724 Change-Id: I546758b4cbb5e3f62f7b66a2faed544abce0d9c2