Merge \"Return DataInputStream to pre-N calls on delegate\"
am: 105f3b0575

Change-Id: I892a6625e76b2e848bcf65fb9d9d2dc7409ad0f7