Merge "Prevent dumping sound models when max reached" into nyc-dev
am: 46c1af6074

* commit '46c1af60749a9d0ff9551998f2648cb7cc2b1124':
  Prevent dumping sound models when max reached