am 3a1e624a: Reconcile with ics-mr1-release

* commit '3a1e624a65a89fe0d9c26025a1c6ee206710c7db':