Merge "Fix bugprone-use-after-move warnings" am: 1c7e676905 am: e59bd9e1a7

Change-Id: Ib55852613336c4def111922b010f938fa7eec14b