Add some backward compatability for GKE.
Merge pull request #2718 from brendandburns/fix

Add some backward compatability for GKE.