Merge proposals dependent on lp://staging/~sil2100/biometryd/fix_ftbfs_gmock

lp://staging/~sil2100/biometryd/fix_ftbfs_gmock has no merge proposals.