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

Change-Id: I12afbe2ff10ca20e0294e2681f1786188d366e28