am d4c617ae: am 41cea4b5: Reconcile with ics-mr1-release

* commit 'd4c617aed18ba4080c773ff40a2b0f75b4a73645':