Reconcile with ics-mr1-release

Change-Id: Ifc8b7e46968eb77bb47eb85274aa7ab35ed36925