Merge "Fix failing user settings test cases."