This reverts commit 99d682ad. Test: m Bug: 305277519 Change-Id: I33c951265229d9f65670760c2255625ef3226707