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