Reconcile with ics-mr1-release

Change-Id: I7af883233dd944c258be11e06a221bdbef316ed3