Merge "Fix several narrowing conversions inside struct initializers"