Reconcile with ics-mr1-release

Change-Id: I265bf3e85c8ba4dc481825ff3d09c8e68436f4b7