Merge "Fix test breakage when phone bluetooth is on"