Fix company controls seed
Merge remote-tracking branch 'google/master'