Merge "Do not use moved-from object"