AUI-865

Hey Byran. I was able to clear out those submodule diffs. Let me know if you have any questions