Reconcile with ics-mr1-release

Change-Id: Ieb9ac03bc8a3983b12d0c38081ad962188b2a724