This reverts commit 56c0aa65. Reason for revert: No longer needed. Bug: 188435815 Test: presubmit Change-Id: I5403baf2adcf2a3f9a4573a69db125e57f5670c5