Merge "Include .proto in sgrep()"