This reverts commit 937247ae. Reason for revert: b/201761974: Causes ITS failures. Bug: 201761974 Change-Id: Id780e07e6cb9bad85eed69d701189c3fd87773f7