Merge "Remove old puller code from uid sandboxing"