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

Change-Id: Ifb15090b906e32305ba1f88aa73067fb791bf520