Fix failing tests caused by hg->git migration

(cherry picked from commit 35d228d86d2f2b3f8fbca519e22f4de3b1126ee4)

Change-Id: Ife584bdf2d257212d8823e1f53ca52a6255c03dc