Merge "b/2511635 Browser displays incorrect SSL cert information"