Merge "Fix bugprone-use-after-move warnings" am: e201a4bc57 am: 16db66ffa6 am: 88ca34ef5f

Change-Id: Ic89dbcf380711895dc80036a8237a7431191defd