This reverts commit 9a7b6f972b. Reason for revert: b/319750648 Change-Id: I778453cf65bb48e31062365a069cfe5b1cb77b96
9a7b6f972b