Merge "Fix bugprone-use-after-move warnings" am: 48b4a46414

Change-Id: Id110c50b752136627bcb2ca819b725b7f85a92cb