Merge "Modify test cases according to change in remove preference behavior."