Reconcile with ics-mr1-release

Change-Id: Ie5af582cf173ff4a8924ad750c1615cb37d70233