8026564: import changes from type-annotations forestReviewed-by: jjgContributed-by: wdietl@gmail.com, steve.sides@oracle.com