Merge "Only decrement mRemaining once in read()."