am 64a907c5: Reconcile with ics-mr1-release

* commit '64a907c5fddb9846737a8e60e603ccbe2267a930':