[US41] Merge protobuf modifications from library-genymotion