am 861de21e: Reconcile with ics-mr1-release

* commit '861de21e614df941810bb1e233e2ddc420884df3':