This reverts commit a011c11f37. Reason for revert: it introduces b/243876449 Bug: 243876449 Change-Id: Ifc798f4bc237dd51921b22eb59b706f38d9edcea
a011c11f37