Reconcile with ics-mr1-release

Change-Id: Idb62646b6cad3f0e0af4520e940799b7a31d6dac