Merging renaming of xplat repo name changes from master to dev