Merge "Fix bugprone-use-after-move warnings" am: e201a4bc57 am: 16db66ffa6 am: 88ca34ef5f am: 08205a7e5c

Change-Id: Icb96a6e437843ae7048de8b11fb8b51a172f42ad