Merge "Change factoryReset to succeed for Settings" into qt-dev am: 015f25c3fa am: 91a70b46c8
am: 6daa890804
Change-Id: I6537cc1b37184c0db27ff9e93a3b55f38292b2be
This commit is contained in: