am 56174149: am 05d10ed4: Reconcile with ics-mr1-release

* commit '561741493b4f99135dd840c7f1da15a2199a4775':