Merge "Seperated out protobuf impl into wrapper classes."
am: b6c99b4cf0

Change-Id: I8ff927eb511cd671c7753e44f11b0a385278366e