Merge "Don\'t specify sub-buffer count for non-fast tracks am: 2ab5ad96 am: 1c9f380a" into nyc-mr1-dev-plus-aosp