am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release

* commit '5cb79935b9ebb74a410d78a986391dda6e9f7994':