Reconcile with ics-mr1-release

Change-Id: I018d3d91a322571a766b22f35217c1fa0d827b6b