Reconcile with ics-mr1-release

Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca