am 1c3bb945: Reconcile with ics-mr1-release

* commit '1c3bb94510cd8f6b8213ae630a83327763c4ded4':