Merge "Fix tests breaking when bluetooth is on" into nyc-dev