am df7d9be0: Reconcile with ics-mr1-release

* commit 'df7d9be0cf5584b544fa94cbca57b797f1e8c2c1':