Merge "Revive compile options mistakenly dropped by I101334d1a5132"