DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: 24d8553316  -s ours
am: 572dfccfc1  -s ours

Change-Id: I17090081cb6721124d3ba513f8d59f1982764cb8