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

Change-Id: I77e0afd30958f155165a56677b8dadeb0bb1dfe2