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

Change-Id: I364eaab79a508b31cc9b0a7993e98c1470486c8e