am 719c9e02: Reconcile with ics-mr1-release

* commit '719c9e027297693d8874a4c3f8864387b9a93154':