Merge "Fix proto cyclic dependency."