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

Change-Id: Ica379a97191bb4c7f7b93b4b3396df9e102d30e0