BZ-13157: Google API wrapper enhancements bug fix