cm/protobuf

Change-Id: I35ea8f7efb4f527caccf1533448b798ca4bcf513