[java-sig-commits] [extra166y/f21] Initial import (#1159976).