Merge "unskip test_list_non_public_flavor"