Merge "Fix a merge error in cl 108991."