am 649302cd: Reconcile with ics-mr1-release

* commit '649302cdf641b99e2b1dc24a22df39c5fa42f8ce':