Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp am: 3db5d42f90
am: 1a2a860d2c

Change-Id: I229a5c77a0dc5d75afc43669eb1d58d16f492844