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

Change-Id: Iabb0a0570f64d39844758d4313d009b380aba356