Reconcile with ics-mr1-release

Change-Id: Iee6e204b8a44a1efb75dea184cc1a69baac91f06