am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."

* commit '5bcdfac94a07c55ce021879d733749775d2d8880':
  Fix uninitialized variable.