jdk

853d3491 - 8337143: Clean up to address reviewer comments