am ffbb05e6: am fbe58079: Merge "Fix warning for uninitialized variable."

* commit 'ffbb05e6744e8de1bfc40fde17aae401217ea003':
  Fix warning for uninitialized variable.