This reverts commit 8efcfd66. Reason for revert: b/270629751 Bug: 270629751 Change-Id: I901c7a0d18cf5e89f17d1c9dfdd42ac1644dc30f