am 8e069a7f: Reconcile with ics-mr1-release

* commit '8e069a7f6674ab29c0dce68b0a4d720ef5ee88c8':