Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
am: b4050d8042

Change-Id: I9d5789a9c4f12c12c5cc13eb8f92d3084a818440