Reconcile with ics-mr1-release

Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9