Reconcile with ics-mr1-release

Change-Id: I04474a99874ad272fba4061c6a8d7eacfd635ce4