Merge "Fix many return-std-move-in-c++11 warnings"