Reconcile with ics-mr1-release

Change-Id: I65f63f2d5a8821761507dfc2e924aa9741e2debd