am acc04ecb: Merge "Fix variable initialization." into jb-dev

* commit 'acc04ecbd174b07d580248aaf6640c3d2b42ca49':
  Fix variable initialization.