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

Change-Id: I932839bd23e57837b6ba15c9c539bb5ed71291c1