am 92e7b912: Merge "Fix a merge error in cl 108991."

* commit '92e7b912929528f23abef6b33d9fa6e6bf327ccc':
  Fix a merge error in cl 108991.