Reconcile with ics-mr1-release

Change-Id: I5126dddc37c62c64d23986cc95edf463c7bb136b