am 1797928f: am f1442113: Reconcile with ics-mr1-release

* commit '1797928f7ad9c901a79a0367564e471657587ca3':