Update package names to work with the proto3 compiler am: e2ff6b3133
am: 5d72bd1b1e

Change-Id: I3ec5036c98d4634acb3fd98c190de6b325096792