Reconcile with ics-mr0-release

Change-Id: Ie3f44336bc3943227ce11e205ba54420bddadbbe