Reconcile with ics-mr1-release

Change-Id: Ifce5c925d39e17abab30cdc9216f8e68c4bce695