Merge "Update package names to work with the proto3 compiler"