Merge "Temporarily disable test_manage_invalid"