Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev am: 4a021fa541 am: 1da71d39b1
am: be75632371

Change-Id: Idd654de6ed5dfb352f1a77febc39dec98aca0dbf