Reconcile with ics-mr1-release

Change-Id: I037563d8ac58380fbe57a781c0b9da3dd7b7c255