This reverts commit b6fae265. Reason for revert: b/129563746 Change-Id: I0516048926104f1dc3856bb3be554e4363d13f8e