This reverts commit 3e302d27. Reason for revert: b/154711554 Change-Id: Ie38d43f8936e45f1e4783b28b940a5faacd1772d