Reconcile with ics-mr1-release

Change-Id: I3a249dc54e38423a4a82a337dd57a977602ecfad