Match Java version 2.9

- Sync up to 110c76c57fb050889f9aedbdef88f26a5375c576