am 07ab4ec9: Merge "Follow up on CL 122665."

* commit '07ab4ec97221d882322a1ce064557202150f44ea':
  Follow up on CL 122665.