Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd am: b529858c0b am: 714c8596ad
am: 098bbc455d

Change-Id: I44b1ed7a8561ee234d6a55a9ed02eb3876c4a7fc