am 66e6a523: Reconcile with ics-mr1-release

* commit '66e6a523b87d74b053c9a5d2289018db22739980':