am 66f52a59: Reconcile with ics-mr1-release

* commit '66f52a594febd5cf37ef38b3150b85b69e990a9f':