Reconcile with ics-mr1-release

Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a