am 9b2e9338: Reconcile with ics-mr1-release

* commit '9b2e933886346d3c513c867eb2972c19cbd4e173':