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

Change-Id: I6537cc1b37184c0db27ff9e93a3b55f38292b2be