am 20090b30: Reconcile with ics-mr1-release

* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':