Reconcile with ics-mr1-release

Change-Id: Ia60d29acdf49193e3f4a950fdfbf187592305aac