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

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