Merge "Fix unnecessary copy initialization warnings"
am: f110ea4893

Change-Id: If17584a8ed6fc53f3681a6ac298730dfbbaf4623