This reverts commit d01913ae. Reason for revert: We're ready to re-enable the flag since b/149121559 is fixed Change-Id: I1aca81bb6c2dbb544841a2a6d17ef477cb8bdc9e