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

Change-Id: I865ccf8bdff800584a0e2eb32ca79ff39f19ecc5