Merge "Fix unnecessary copy initialization warnings" am: f110ea4893 am: 820868b72e
am: 9ac8d1191a

Change-Id: Ibe0c89318d428b4c653814c7ebbad6b32cd1f39b