This reverts commit 66430ca2. Reason for revert: b/261941458 Change-Id: Id77e5e37c2d6117d54dbbf17d1f4a6b5c0cffd48