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

Change-Id: I75b0f141421ff0eec3e9d62daf953600a8173186