Reconcile with ics-mr1-release

Change-Id: I3086a5158ff4ee2cbea7395e4187349dcd91d02a