Reconcile with ics-mr1-release

Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f