[automerger skipped] Merge "Fix bugprone-use-after-move warnings" am: 0dbbb661 am: d6276866 -s ours
am skip reason: Change-Id I185cb21521676ddbc4f2b7f098611a2efc7275e6 with SHA-1 933c7a61 is in history
Change-Id: I70278cd3f003ff2713ed5228ea7e37417feec587