Reconcile with ics-mr1-release

Change-Id: I16992771cb36cef7114e0c5d6ee33578a446f872