Merge "Fix no module unit test for Python3.6"