am 04929638: am da3510b2: Merge "Avoid partial initialization warning."

* commit '049296382d3604868378c957e999ae63cf3a1f5f':
  Avoid partial initialization warning.