Reconcile with ics-mr1-release

Change-Id: Ibedde76d39b336b7a11b3793d824a3a4f933bf30