Merge "Suppress bugprone-use-after-move warnings" am: 100a6f64e5

Change-Id: I7c823a6edef4da049efb226855b06f05b8951fd0