Reconcile with ics-mr1-release

Change-Id: Ie9525c4ab1c5eaaa587e9b895f7bf5dbcf1fb5f0