Merge "Re-submit "Add genrule for the current sdk proto""