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

Change-Id: I1ffad4d441e1a331e06ae778bf51dd41e5fecac2