Merge "Seperated out protobuf impl into wrapper classes." am: b6c99b4cf0 am: 59923d79bf am: e622e51f78
am: 74f39d981f

Change-Id: Ifc6fefa17ddf0b06981311f594f0312f1ca7243b