Merge "Extract getExistingCounterMap from AAITreeConverter to ModelUtil"