This reverts commit b59c74f302. Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383) Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
b59c74f302