am 19417bef: Reconcile with ics-mr1-release

* commit '19417befca4aa6b3d55b6d23103b75ee54ff6e89':