Reconcile with ics-mr1-release

Change-Id: I4518215eb5788221551703ab02142d909644c1a7