Reconcile with ics-mr1-release

Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e