Tweaks for new googleapi compatibility
Tweaks for new googleapi compatibility

http://codereview.appspot.com/5418057/
ericmckean/acre,threefish/acre,gagoel/acre,gagoel/acre,gagoel/acre,threefish/acre,ericmckean/acre,ericmckean/acre,gagoel/acre,ericmckean/acre,threefish/acre,gagoel/acre,ericmckean/acre,threefish/acre,threefish/acre,ericmckean/acre,gagoel/acre,threefish/acre