Merge "DO NOT MERGE: Revert "Update package names to work with the proto3...
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: b4050d80
am: d331d57d -s ours
Change-Id: Ie697d5efaea39e1522e947ac1a8f38f1443a1964