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

Change-Id: Ie232256652e45f209eda1f450cea88ac37b76705