Reconcile with ics-mr1-release

Change-Id: I33b1f4272aa08181d0432271d15ae6fc62e6e2a7