Reconcile with ics-mr1-release

Change-Id: If3e7c291746adfa9cd3b7696753f4846bdfc0d63