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

* commit '03125c8f836a40e8d7e1702fadfb3c220ce29e19':
  add error propagation for thunking layer