Reconcile with ics-mr1-release

Change-Id: I218c334a9e76e161bda994ced6b5ba41f0c79ddd