am 99c65114: Reconcile with ics-mr1-release

* commit '99c65114b976fd8ceb54021cede0dd63f8826a02':