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

Change-Id: Ie6861ff4f8b0a679c4640c298d2290942c6b297d