Reconcile with ics-mr1-release

Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7