Fix failing tests caused by hg->git migration

(cherry picked from commit 35d228d86d2f2b3f8fbca519e22f4de3b1126ee4)

Change-Id: I2b61996c7598490359e68530550d35c0c5facdc6