am 7e11af8f: Reconcile with ics-mr1-release

* commit '7e11af8f5813972dd64032e70068e10f87771234':