Reconcile with ics-mr1-release

Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3