Merge "Fix bugprone-use-after-move warnings" am: e201a4bc57 am: 16db66ffa6

Change-Id: Ia07e7e9b667371d032540991d60135d13d86fb57