am 80bcb489: Merge "Fixed un-initialized variable warnings"

* commit '80bcb4893058be698bae1bef59c4b28edda6c744':
  Fixed un-initialized variable warnings