am 5628711a: Merge change 6855 into donut

Merge commit '5628711a6f5674070da674488513d2e1b03c4959'

* commit '5628711a6f5674070da674488513d2e1b03c4959':
  Add a Gservices setting to control if we send up multipart protocol buffers