Merge "Fix bugprone-use-after-move warnings" am: c33da6fa6a am: f8c98a0f04

Change-Id: Iee69771f9130eb8471d1e6a3eb580df8608efb1c