am 97f325b1: am 3921c68a: Reconcile with ics-mr1-release

* commit '97f325b15e4f436d37c8cf8197b2f9911160a22b':