Merge "should return correct length and use shorter poll time for ad2p data"