Merge "Revert "Enable D8 by default.""