Reconcile with ics-mr1-release

Change-Id: Ia4187b14f758bd210916c842cd05cac913162c67