am 6746511d: am a599eb9a: Reconcile with ics-mr1-release

* commit '6746511dd9b243080bc4bd820923078a65b82e2a':