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

Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d