Distribute GridUtil methods where they are actually used (#13334)

Change-Id: I10f015d0f5fce8f005a4ebdfeb218025459cf751