Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev am: 742b0a7d12 am: 29550c9297  -s ours
am: 521489c1fa  -s ours

Change-Id: Ie4507cc1a505d8b079b7dd5202bae7a5fe7affcc