Merge "Revert "Revert Cls stopping now-master running on googlefood"" into ub-now-master