Merge "Added stub for getting buffer" stub exists