Replace a manual buffer allocation with std::vector am: b2b3323f45 am: 50cd609aa0
am: b869d4b4d3

Change-Id: I2b6d309b494c9090abbc46f27da0893adc6404e5