Merge "Remove unneeded optimize_for lite"