This reverts commit 40c59fde. Reason for revert: b/73083791 Change-Id: I044e534be07c5fd18c99dcc65a14b72eaf1fecd5