Merge "Change factoryReset to succeed for Settings" into qt-dev
am: 7fc7f9ce22

Change-Id: Iaec2ead1a4ba9a947d00d4dd92a303889b16147d