This reverts commit 8b7f627f. Reason for revert: b/230821289 Change-Id: I3032103b174c78586b38b64d2748ec5a42fa9522