Reconcile with ics-mr1-release

Change-Id: I6b3173e0900eedd8c37be072173650ff89f41e45