am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

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