am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release

* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':