Reconcile with ics-mr1-release

Change-Id: I54bb077fa4b6424bd1c6da1e5b326194a78c6c05