Update to Objectify 4 final