Reconcile with ics-mr1-release

Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b