Update package names to work with the proto3 compiler am: cbd3f0c59a  -s ours
am: 2c8d6c4c39

Change-Id: I092a61abba417a71fe1a8eb9d29016e74808feb2