Merge "Allow extra_apex_payload_key to take multiple names at once"