am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
  Cherry-pick f51125d from master to ics-mr0. do not merge.