Reconcile with ics-mr1-release

Change-Id: I9401b1c20c415cb19fc8fbcbafb2d94cf0f1e6a3