am da3510b2: Merge "Avoid partial initialization warning."

* commit 'da3510b27246de1ab3eda38a14a80839e2f39c64':
  Avoid partial initialization warning.