Merge "Fix test incompatibilities with py35"