Merge "Fix usage of Read instead of ReadFully."
am: 61f4ceb55a

Change-Id: I1dbbb6100b74abe2dd0b480112475ea87945edd2