roll back UT for set password
Merge branch 'rollback_ut_for_setpassword'