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

Change-Id: I1eef88c9d6c4095e50666a48a8955cc7b5e3a45f