Merge "Limit test group and leaf controller updates to that scope."