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

Change-Id: Icfc13c71e2d768a1080aeaa9130896621fe986ce