Reconcile with ics-mr1-release

Change-Id: I9836cd02d0be2bacef2f68cddb621e41f693b84f