This reverts commit 45dd2a32. Reason for revert: b/195280234 is blocking droidfood Bug: b/195280234 Change-Id: I09593dffb797d1e4c60cff52e7901ed6c00f719c