am 37d0f260: Reconcile with ics-mr1-release

* commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':