Reconcile with ics-mr1-release

Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e