This reverts commit 71fd3120. Reason for revert: No longer needed. Bug: b/141954427 Change-Id: Ib3205494695fad0389e15e2a52427d0496be8f44