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

Change-Id: I15766860cf5bbfa3dd890133f4bfbb436cc4f4b7