am d2f3e67c: am 61fe9efb: Reconcile with ics-mr1-release

* commit 'd2f3e67ce04e1a86ac26fcd0c6ed89abc3da0bb5':