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

Change-Id: I59c218fe5048f2d9e828f6f4f621b031cd424acd