Reconcile with ics-mr1-release

Change-Id: Ifb9dad264079f0a566dd978dd56414fbaf59b9e0