Merge "Fix bugprone-use-after-move warnings" am: c33da6fa6a am: f8c98a0f04 am: db1fef8f68 am: 6b3892a162

Change-Id: If1c54a633c004979481f1b12690798b4a8acf40c