Reconcile with ics-mr0-release

Change-Id: Ib5183f3421d0c1d48a91439bd777236781a9fcc9