Merge "Change USC project to use local distribution"