Reconcile with ics-mr1-release

Change-Id: I59976252335ee94a0733882cce81648017f410bf