Merge "Update SF dump to use proto3"