This reverts commit 302aa72446. Reason for revert: b/308468754 Change-Id: I27ab7e374324b99e7a039b06ad698c214d97592a
302aa72446