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

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