am 1a9f6bf7: (-s ours) CherryPick 676e13 from master to mr0. do not merge.

* commit '1a9f6bf710d1e437b62fe49ff616fca814066982':
  CherryPick 676e13 from master to mr0. do not merge.