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

Change-Id: I714a8e46fb948b66d10efe15c536a625e67e9d2c