Merge commit '08357b2' into google-api-python-client_v1.5.1 am: e689baca44 am: c8dec01096
am: d21fd11533

Change-Id: I41aeb170e302a3c91186fe2d96da7bca9cd31ca5