This reverts commit 521eb20d. Reason for revert: b/301463284 Change-Id: I45f4793694654f3afd2dee6188e0bf58cfb48992