am c541cd6e: Reconcile with ics-mr1-release

* commit 'c541cd6ecb59fdaa339585c48395d06ccd03867e':
  IMM19