Merge "Remove duplicate initialization from bad merge."