Merge "Slices: Don't use public namespace for internal intent" into pi-dev