This reverts commit 6d089b7d. Test: m Bug: 305277519 Change-Id: Iaa27fa0aae8ef624b403e905bfb04df15e380baf