Change to galaxys2plus-common