This reverts commit 96f11eed. Reason for revert: <test break, see b/223401286> Change-Id: I930e3077c27a261d280ad145791c9096a9c6409e