This reverts commit b69eacf5. Reason for revert: b/206897143 Change-Id: I83c0afeb0b589b41db26017fc904acaa64604de6