Company control regs

[story:41991227]
[story:40582169]
Merge remote-tracking branch 'google/master'