am 288cde7f: Reconcile with ics-mr1-release

* commit '288cde7f0a17f47f7071168f442d19f703947cc9':