Reconcile with ics-mr1-release

Change-Id: I11a62848c4e3a94174ca5f5a192e65fb5f7cc9e6