Reconcile with ics-mr1-release

Change-Id: Ibcc62fa97c67045aa92f123e522470126a64ef9c