am 804865e7: Reconcile with ics-mr1-release

* commit '804865e7d61b1f319003968dcd4a195e9686bfd1':