Reconcile with ics-mr1-release

Change-Id: Ifeec32b7ae10d39adcd0e72c302547fc4f9feaf9