[java-sig-commits] [jdiff/f16] Initial import (#817278).