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

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