Merge "Change namespace for internal only intent."
am: 841935dff4

Change-Id: I788f402c88429a0a8becd62319009ff0ae53b094