Merge "port test_images and test_server_actions into v3 part1"