BZ-12871: Refactoring based on changes to neGoogleAPI