am 0f03bad3: Reconcile with ics-mr1-release

* commit '0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':