Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 am: eed50c1809
am: cfc4e21899

Change-Id: I0478ca20b670f7ddd776ea98f3d5d1db928842ac