am 2a6e5cf4: Merge "Fix uninitialized variable."

* commit '2a6e5cf4e8b39e3b0b540d3cf49568c61e9d67cd':
  Fix uninitialized variable.