This reverts commit e2944072. Reason for revert: b/274471236 Change-Id: I5d0ba3a4e0c7a3b2ffa41d48208d52221f48f290