Merge "Fix old python2 test issue."