am d9e771db: am 63bd76fb: Reconcile with ics-mr1-release

* commit 'd9e771db74ea09560132d5937433bbf1006b389a':