Merge "Temporarily switch system class submodule to github"