am 0f967c02: Reconcile with ics-mr1-release

* commit '0f967c02c113c62f17f3f3c93164269fb5818a36':