am 0e511149: Reconcile with ics-mr1-release

* commit '0e51114927aecac7a283eee4d6449709027224d5':