Reconcile with ics-mr1-release

Change-Id: I688cf54676066e85461bf4d95b3cf500b7831493