am b7602a57: am 2fde4bf8: Reconcile with ics-mr1-release

* commit 'b7602a57444af5535543033807955aacc8552bf3':