Reconcile with ics-mr1-release

Change-Id: I1c603308272f9b00174c3f9046171e069ffee566