cb05c49ff0
This reverts commit cea90d45a6.
Reason for revert: b/417535264 reland
Bug: 417535264
Change-Id: I8611ec59c9574021a0d925d35ee6523faebd6d18