Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev