am 15fc0e5f: Reconcile with ics-mr1-release

* commit '15fc0e5f2abce63586f170409e427f6b12d43240':