This reverts commit 453f4dde. Reason for revert: b/278201025 Change-Id: I3e1b45dc7e9a8b39d95b90b5166a3936a0540436