Merge "Fix unnecessary copy initialization warnings"
am: 38858d6dd3

Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57