am d2cfa3f7: am b6f94723: Reconcile with ics-mr1-release

* commit 'd2cfa3f7ce9f958fb6133494f9c5761cbea7ff59':