Merge "remove GoogleWebContentHelper class"