am 4ebb303a: am 8d8c81c2: Reconcile with ics-mr1-release

* commit '4ebb303a43246281c76f069989e9f3fe6af226c7':