am 44eae4c7: Reconcile with ics-mr1-release

* commit '44eae4c7af901e521e2e880a8300b285bbf53010':