Reconcile with ics-mr0-release

Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f