am ab79fb5b: (-s ours) DO NOT MERGE Grandfathering existing devices into aggregation policy.

* commit 'ab79fb5b789459312289fc87bd33414c78147d8f':
  DO NOT MERGE Grandfathering existing devices into aggregation policy.