Update package names to work with the proto3 compiler am: fbd5f5fdce
am: 6cd7e52b9e  -s ours

Change-Id: I3cf9d3c6758b1180fad7491da0afcff141b8ec04