am ca915793: Merge "Increase sampling data size limits" into klp-dev

* commit 'ca915793500c5db9476e21d029e836b78d580863':
  Increase sampling data size limits