Merge "Avoid IllegalArgumentException when bluetooth is disabled" am: 2a1bdd2429
am: 787e52045f

Change-Id: I3f55d6e7b56170ee4cafaf60e7ef8b908080c182