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

Change-Id: Iea895d4bbbae2fd6ddaf0c7627c8066c0a7e6033