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

Change-Id: I99a0a0fd4c9b17d683ccb62da10c31345d34dcf3