This reverts commit 74092d1e. Reason for revert: regression as b/228282275 Bug: 222697646 Bug: 228282275 Change-Id: If21af3b5bf993fa0ed3760bb5c68d23ba0b4cfd5