Merge "Fix bugprone-use-after-move warnings" am: 0dbbb661cf

Change-Id: I6d2d52c3ea27b86a48a7118211beb199741c13c9