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

Change-Id: I737c8495153db87214a27bfc08a97435790fb120