Reconcile with ics-mr1-release

Change-Id: I29287109bc555579a9c66b586a3636ba41be5c57