am bf9e5c91: Reconcile with ics-mr0-release

* commit 'bf9e5c9193da5eb1b787a64b03d4a38a2763eb52':