Merge "Fix the imgdiff failure when running test_common unittest"