am 19ac8238: am 99c65114: Reconcile with ics-mr1-release

* commit '19ac823851c7f8691d5aecbc5a0149ba72ed806c':