Fix failing tests caused by hg->git migration

Change-Id: I0a333c7f559e468e664fa27016356aa2713cbbb5