Reconcile with ics-mr1-release

Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e