Reconcile with ics-mr1-release

Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9