Merge "Update package names to work with the proto3 compiler am: cbd3f0c59a  -s ours" into nyc-mr2-dev-plus-aosp
am: 391ab8caaa

Change-Id: I204d0beaf83bfb0b841d08aba3eb0f0101bbfaf1