Reconcile with ics-mr1-release

Change-Id: I630e0b0e626be5ae01eb8df72815eec298526d1b