am d24b430c: Merge "Extra sanity checks on sample size and resolution" into mnc-dev

* commit 'd24b430c3fc82e9288e9072971c9a185a18abd89':
  Extra sanity checks on sample size and resolution