am 1f38f72a: Reconcile with ics-mr1-release

* commit '1f38f72abdc43ac2131e86db3e834a234f7cfaad':