Reconcile with ics-mr1-release

Change-Id: Iea2f9c952029f0b86da7a550c2c2bf7c8a1be485