Reconcile with ics-mr1-release

Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0