Merge "Security fixup for Slices" into pi-dev