Reconcile with ics-mr1-release

Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507