Merge "Fix unnecessary copy initialization warnings" am: 38858d6dd3
am: d5de710016

Change-Id: Ie86ab05432cfde69464cfeb3341248dd6b18675e