am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.

* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
  CherryPick f9e455 from master to mr0. do not merge.