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

* commit '8ce964f49db1ae53624847382e708f05d76a64a6':
  Extra protobuf-related support