Reconcile with ics-mr1-release

Change-Id: If09ddcaa675b12a1d92a48f2c7ce7c315482f43f