Seperated out protobuf impl into wrapper classes. am: 2920754397 am: 85204bdd59
am: fa40cee166

Change-Id: I9ab0f83671cd9e9a387f1f62b292bea18ba90ed9