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 '6323529b60f29ad1e18757f4aadc08f2aa0e846b':
  Extra sanity checks on sample size and resolution