Reconcile with ics-mr1-release

Change-Id: Iece5fc7cf15320addfda3f143235664e2ef3083d