fb092a9a6c
This reverts commit 26c11f2c49.
Reason for revert: b/333937249
Change-Id: Ide851596f5be7cea28df18dc27701b3cc0104bf1