Reconcile with ics-mr1-release

Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49