am 071222d9: Reconcile with ics-mr1-release

* commit '071222d913b2e5645f058b1e278de70de977c09c':