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

Change-Id: Ib8361625c9d0ef00f6cbbb6e35b5167ce8d7dcd6