am f3b88c7a: Merge "Simplistic fix for initialization race" into klp-dev

* commit 'f3b88c7a420df1877cb3ea2b38094da72353bd31':
  Simplistic fix for initialization race