am 175d5d76: Reconcile with ics-mr1-release

* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':