Merge "Fix bugs in tests which fail when Bluettoth is turned off. on internal gerritt, this is ag/3738365"