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