8043004: Reduce variability at JavaAdapter call sites

Reviewed-by: lagergren, sundar
9 files changed