Reconcile with ics-mr0-release

Change-Id: Iff6fe79bb32f07a776e0f12569baa738e76bbd37