Merge "Fix bugprone-use-after-move warnings" am: 1c7e676905

Change-Id: I084bddcebb9777b0555f6202ec7874789de74e48