This reverts commit df59c2e535. Reason for revert: b/293944420 Change-Id: I0ae830e1a5ba8affb6815c9e96ffee1b20c6e8d0
df59c2e535