am 63bd76fb: Reconcile with ics-mr1-release

* commit '63bd76fbd689ed2f3a347d628fa939a605aed316':