BZ-13157: Google API wrapper enhancements bug fix
Merge remote-tracking branch 'origin/RC20140821' into integration