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

* commit '2039512c305c8fb21cdce1e338fd36ebeec8ec85':
  Extra protobuf-related support