Merge "Build browse intents based on target user." into pi-dev