Merge "Fix the imgdiff failure when running test_common unittest"
am: 7136100be6

Change-Id: I2077f6ce034c2f3a4c27834aa26422f075e1b0db