Merge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev
am: 67cee97754

Change-Id: I74ad62e53fc245f8c77741db3235543846f70832