am 4b067bdf: Reconcile with ics-mr1-release

* commit '4b067bdf05bd8fca840253a43fb0ff25846d35c1':