Reconcile with ics-mr1-release

Change-Id: If426064c21b870685508859b0c7dc3b9ece94e14