Merge change 21469 into eclair

* changes:
  do not merge: Merged CL 21093 from goog/master to goog/eclair