a6bf5a0014
This reverts commit fb092a9a6c.
Reason for revert: b/333937249
Change-Id: I77bd6c0d2fbe2f2dad074e8e0e741b50d4d7c204