Merge "Add BrowseErrorActivity and ErrorFragment."