Reconcile with ics-mr1-release

Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da