Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd
am: b529858c0b

Change-Id: I4a04a1e766551d0c15e3b4c14226363c97daf032