Relationship type static validation [story:41685995]
Merge remote-tracking branch 'google/master'