Reconcile with ics-mr1-release

Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7