Reconcile with ics-mr1-release

Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca