Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2...

Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2 am: a3416fc6 am: 42f2fab1 am: 483cf883 am: f89b2427 am: 7779f826 am: c343fd28 am: 69b0154d am: 1d66db35 am: 849b3d0c am: ef0a06ba am: 9a5104dd am: 1f3a28ec am: 5dd96d24
am: 09c75383  -s ours

Change-Id: I79c0d15c93612093fcb07f87f164c966c9f6548c