am 6aa8411f: Reconcile with ics-mr1-release

* commit '6aa8411f2f1258cecd4c1fb593195568d08fef18':