Reconcile with ics-mr1-release

Change-Id: Ic204fd8660e2c643527f796aad2d5d870243d8bd