Reconcile with ics-mr1-release

Change-Id: Ieaacd272ef768930f444735139215730b1c218b6