Merge "Fix unnecessary copy initialization warnings" am: 555d48742d am: 5d4da7ba22
am: 1513e7f57e

Change-Id: I53ffcb9a4dfa7f25edf936df3ab5e4fb9a6f3bcf