Reconcile with ics-mr1-release

Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526