am 48d1d1fc: am f1519eeb: am 64b83133: Merge "Remove usage of SharedBuffer"

* commit '48d1d1fc902543ea16e5826a4739346714691d8c':
  Remove usage of SharedBuffer