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

Change-Id: I5b826a4744cd4dfc8848ab6cd8313307d537d68b