Reconcile with ics-mr1-release

Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133