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

Change-Id: I59f2ade8819e1093fd9e46ee6b71756ae026292b