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

Change-Id: Ifbbdf54efe22128725600f5da4956547fe5871cf