am f08ebe9e: Reconcile with ics-mr1-release

* commit 'f08ebe9e0d54250d656c4a6c245ec0b5335ccae2':