Reconcile with ics-mr0-release

Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5