Reconcile with ics-mr1-release

Change-Id: Icc949faeb31116d30c41d174f4e14424c4c2791d