Merge "Fix unnecessary copy initialization warnings"
am: 555d48742d

Change-Id: I99c9496534709f8c256e85940cdedad162339176