Reconcile with ics-mr1-release

Change-Id: Ie919f6cfc9ec35f4abffd16fadd0dcf3fe0e0e6f