This reverts commit 683379d6. Reason for revert: b/146585515 Change-Id: I8cd03418c51e4dcacd292273e98198c335b865cf