Seperated out protobuf impl into wrapper classes.
am: 2920754397

Change-Id: I35b99db03117f063b2835544ed3984c1b43aa116