This reverts commit a825a5c0. Reason for revert: regression as b/228282275 Bug: 222696368 Bug: 228282275 Change-Id: Iba99b5a9ab53a829ce4928cccc47293e62f76162