Merge "Avoid partial initialization warning."