Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev