Reconcile with ics-mr1-release

Change-Id: Iada48b304b339c50295052d0c9bf6802dc41cfb7