Merge "Fix FastTrack creation buffer count irregularity" into nyc-dev
am: 0be3be0

* commit '0be3be0cf5530d6faf655c325ec9d94a2bd53564':
  Fix FastTrack creation buffer count irregularity