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

* commit '1723245e387454fbcda74cda6d5efeee7e148bda':
  Fix variable initialization.