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

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