Reconcile with ics-mr1-release

Change-Id: I362f8b5a537784565d3212cfd76584f9f0971801