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