Merge "Add host side test for secondary user rollback"