am 21cb1290: Reconcile with ics-mr1-release

* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':