Merge "Change factoryReset to succeed for Settings" am: c687700cde
am: 9d59a75463

Change-Id: I9b7ce285fc205255dd9e2e0fa71afd0f8392d243
tree: 423d38cd722b0481d7a408e797a3abb861c689d2
  1. core/
  2. services/
  3. tests/