Reconcile with ics-mr1-release

Change-Id: I30d0a8dd58ee6ca4cd3d74a4370933deb8198abf