A+C: Rodrigo Moraes de Oliveira (individual CLA)

Generated by addca.

R=gobot
CC=golang-dev
https://codereview.appspot.com/7526045