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

Change-Id: Ia784b075d86ef8874604c23e5c73604e009c0c50