am 61356271: am e388ac10: Merge "Extra protobuf-related support"

* commit '6135627140bd799ee56ba894b69a9455ca0af86a':
  Extra protobuf-related support