am ee83c07e: Merge "add error propagation for thunking layer" into klp-dev

* commit 'ee83c07e5185e20e6da629eeb29c72b6d904f518':
  add error propagation for thunking layer