Reconcile with ics-mr1-release

Change-Id: If71e2c395991615099e415e9871bce1e8910b5c2