am 8fff8c66: Merge "Fixed maybe used uninitialized"

* commit '8fff8c66738b35bafc5318e408afa21c34c57ff3':
  Fixed maybe used uninitialized