Reconcile with ics-mr1-release

Change-Id: Ifa837ef35780c94b49379c9caa315ae3dc9adb93