Reconcile with ics-mr1-release

Change-Id: I57c42bb328601bc5d9bdd84f9f187a34d389e2bf