Merge "Update package names to work with the proto3 compiler am: cbd3f0c5 -s ours" into nyc-mr2-dev-plus-aosp