Merge "Merge "PipelineCache: track buffer allocation" into nyc-dev am: 0eae982184...