Merge "Allow factory reset when bluetooth is off (1/2)"
am: 1dfa47e

* commit '1dfa47ee3e55592249a76cb72f9e16be664f2b40':
  Allow factory reset when bluetooth is off (1/2)

Change-Id: I0e9300c86a6ec1f07d5b1a5c83f1b87a2c5ffaa5