Use field references to pass odom changes back to java-land
Do less explicit message instance recycling
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'