Reconcile with ics-mr1-release

Change-Id: I303839aeb6fa14037b407a34e326737de536c073