am d7176fd5: Reconcile with ics-mr1-release

* commit 'd7176fd5571bc9878d3cdac8696eaa35ec170d9d':