Reconcile with ics-mr1-release

Change-Id: Ied11f64a3034d8c8a29f2c68151f3e23564c6a69