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

Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076