am 64d8a4ed: Reconcile with ics-mr1-release

* commit '64d8a4ed00646c3e327f0a636cc295b6a02d611f':