Reconcile with ics-mr1-release

Change-Id: I67b518d4c77717257ece4c85d931ea017c137cf1