This reverts commit fe82172a. Reason for revert: Broke presubmit: b/157231582 Change-Id: Ifec2d2cf58d00ed320db65069a49290e31f8bda4