Reconcile with ics-mr1-release

Change-Id: I27a75e893fe4a1e17c7e0b7dd0e96116f3437762