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

Change-Id: I9b7ce285fc205255dd9e2e0fa71afd0f8392d243