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