am 177a169c: am 8544aac8: Reconcile with ics-mr1-release

* commit '177a169cdc334981ca8c668fcfe412755eb8484e':