Reconcile with ics-mr1-release

Change-Id: Ia525b5e031eef575cc3b08a942c02409df39329e