am 94cb9311: Reconcile with ics-mr1-release

* commit '94cb931135823c9e80a66f690fe82717207a00ef':