Merge "Set additional info for LaunchBrowser error case."
am: 82be71e1c4

Change-Id: I8b8e8844231946485db2a1c62953109e3f6f57ef