am 63acc68f: Reconcile with ics-mr1-release

* commit '63acc68fdda04376dbba33b875be49ba0897d1cd':