This reverts commit 62c74f9633. Reason for revert: b/267543857 Change-Id: Ifc2fc3abfc07c92acef560fd3eef7d799f3e28bf
62c74f9633