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

Change-Id: I36a69c97d520118ae39e6768b7e82f3d71d056bb