8024644: PluggableJSObject.iteratingJSObjectTest fails with jdk8-tl build Reviewed-by: jlaskey, hannesw

8024615: Refactor ScriptObjectMirror and JSObject to support external JSObject implementations Reviewed-by: jlaskey, hannesw

8024130: We no longer need slots for temporaries in self-assign indices Reviewed-by: jlaskey, lagergren

8024539: FX Libraries update missing file Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8024397: Nashorn FX Libraries need to be finalized. Reviewed-by: sundar, hannesw, lagergren Contributed-by: james.laskey@oracle.com

Merge

8024180: Incorrect handling of expression and parent scope in 'with' statements Reviewed-by: jlaskey, hannesw

8024255: When a keyword is used as object property name, the property can not be deleted Reviewed-by: jlaskey, lagergren

Merge

8024174: Setting __proto__ property in Object literal should be supported Reviewed-by: jlaskey, lagergren

8024120: Setting __proto__ to null removes the __proto__ property Reviewed-by: lagergren, attila

Added tag jdk8-b107 for changeset e94578d4e6a5

Merge

Merge

Merge

8017195: Introduce option to setKeepAlive parameter on CORBA sockets Reviewed-by: chegar, msheppar

Added tag jdk8-b107 for changeset 03623ef0f781

Merge

Merge

Merge

8008022: Upgrade Direct X SDK used to build JDK Reviewed-by: erikj, prr, ihse

Merge

7097386: Correct error in Predicate javadoc example Reviewed-by: alanb, shade

8024874: Copy-paste typo in the spec for j.u.Comparator.thenComparing(Function, Comparator) Reviewed-by: mduigou

6458027: Disabling IPv6 on a specific network interface causes problems Summary: added a check to test if an interface is configured for IPv6 to native code TwoStacklainDatagramSocketImpl: getMulticastInterface, setMulticastInterface Reviewed-by: chegar, michaelm

8020687: Deflater.setLevel does not work as expected Summary: to clarify the api to match the existing implementation behavior Reviewed-by: alanb

7186311: (props) "Unicode" is misspelled as "Uniocde" in JavaDoc and error message Summary: to correct the typo Reviewed-by: alanb, chegar

8024837: Rename java/util/concurrent/ConcurrentHashMap/toArray.java to ToArray.java Reviewed-by: alanb

8010293: java/util/concurrent/ConcurrentHashMap/toArray.java fails intermittently Reviewed-by: forax, chegar, alanb Contributed-by: Doug Lea <dl@cs.oswego.edu>, Peter Levart <peter.levart@gmail.com>, Paul Sandoz <paul.sandoz@oracle.com>

8023556: Update javadoc for start of Meiji era Summary: correct the javadoc in JapaneseEra.MEIJI to match the implementation Reviewed-by: darcy, sherman

8023639: Difference between LocalTime.now(Clock.systemDefaultZone()) and LocalTime.now() executed successively is more than 100 000 000 nanoseconds for slow machines Summary: Test timed out on a slow machine; it is not a conformance test and should be in the test subtree Reviewed-by: darcy, sherman

8024825: Some fixes are missing from java.util.stream spec update Reviewed-by: mduigou

8014967: EBehavior of DriverManager.registerDriver(dr) is unspecified if driver is null Reviewed-by: alanb

7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx] Summary: On MacOS X set user.home to value of NSHomeDirectory() Reviewed-by: alanb, ddehaven, mduigou

8024014: TEST.groups - split sub-groups for jdk_collections, jdk_stream, jdk_concurrent, jdk_util_other from jdk_util Reviewed-by: mchung, dholmes, alanb

8021591: Additional explicit null checks Reviewed-by: psandoz, alanb

8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows Summary: amended test to add active, i.e. isUp(), NetworkInterfaces to test list Reviewed-by: alanb, chegar

8024009: Remove jdk.map.useRandomSeed system property Summary: Removed usage of hashSeed in Hashtable & WeakHashMap, and removed tests Reviewed-by: alanb, mduigou

8023669: MBean*Info.hashCode : NPE Reviewed-by: dholmes, dfuchs, jbachorik

8010430: Math.round has surprising behavior for odd values of ulp 1 Summary: If the effective floating point exponent is zero return the significand including the implicit 1-bit. Reviewed-by: bpb, darcy, gls Contributed-by: Dmitry Nadezhin <dmitry.nadezhin@oracle.com>

8011916: Spec update for java.util.stream 8024339: j.u.s.Stream.reduce(BinaryOperator) throws unexpected NPE Reviewed-by: mduigou Contributed-by: brian.goetz@oracle.com

8015340: remove erroneous @since tag Reviewed-by: darcy

8024618: Issues with French locale on compact1,2: expected:<janvier> but was:<January> Summary: Tests against the data of the French locale are not valid as conformance tests and are redundant with testing of the US Locale above Reviewed-by: alanb

8024525: Make Logger log methods call isLoggable() Summary: This changeset makes the various Logger logging method call isLoggable() instead of inlining the level checks. Reviewed-by: mchung, alanb

8024643: Turn on javac lint checking in building the jdk repo Reviewed-by: erikj, ihse, smarks

8023529: OpenMBeanInfoSupport.equals/hashCode throw NPE Reviewed-by: dholmes, dfuchs

8024500: Missing API coverage for java.util.function.BiFunction andThen Reviewed-by: mduigou, alanb

8024338: Constant fields introduced by JDK-4759491 fix in b94 are exposed as public fields in public API Summary: to move the new constants out of ZipConstants.java Reviewed-by: martin

Merge

8024164: JSR310 serialization should be described in details Summary: The serialized-form.html should specify the stream format for interoperability Reviewed-by: alanb

Merge

8024601: Windows networking code prevents use of -Xlint:auxiliaryclass in jdk build Reviewed-by: chegar

6962494: Update documentation on Executable.getParameterAnnotations() Summary: Update javadoc comments on getParameterAnnotations to correctly describe its behavior Reviewed-by: darcy, jfranck

8024332: sun/util/resources/en split between rt.jar and localedata.jar Reviewed-by: alanb, erikj

8023090: Additional debug info for java/net/NetworkInterface/Equals.java Reviewed-by: alanb

8024508: Fix doclint issues in com.sun.nio.sctp Reviewed-by: alanb

4987375: (reflect) Class.get{Declared}Method{s} does not return clone() for array types Summary: Update spec to match long standing behavior Reviewed-by: darcy, mchung

8024141: Unexpected timezone display name Reviewed-by: peytoia

8024501: sun.security.mscapi.Key has no definition of serialVersionUID Reviewed-by: weijun

8023878: (fs) TEST_BUG java/nio/file/WatchService/SensitivityModifier.java fails intermittently Reviewed-by: alanb Contributed-by: yiming.wang@oracle.com

8024444: Change to use othervm mode of tests in SSLEngineImpl Reviewed-by: mullan

8023447: change specification to allow RMI activation to be optional Reviewed-by: darcy, alanb, olagneau

8024432: Fix doclint issues in java.security Reviewed-by: darcy, mullan

8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address Summary: amended src/windows/native/java/net/NetworkInterface_winXP.c to "properly" handle Ipv6IfIndex Reviewed-by: chegar, dsamersoff

8023326: [TESTBUG] java/net/CookieHandler/LocalHostCookie.java misplaced try/finally Summary: amended test to be more robust to set of potential exceptions thrown Reviewed-by: chegar, khazra

8023168: Cleanup LogManager class initialization and LogManager/LoggerContext relationship 8021003: java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java fails intermittently 8019945: test/java/util/logging/LogManagerInstanceTest.java failing intermittently Summary: This fix untangles the class initialization of Logger and LogManager, and also cleans up the relationship between LogManager, LoggerContext, and Logger, which were at the root cause of some intermittent test failures. Reviewed-by: mchung, martin, plevart

8024046: Test sun/security/krb5/runNameEquals.sh failed on 7u45 Embedded linux-ppc* Reviewed-by: xuelei

7188657: There should be a way to reorder the JSSE ciphers Reviewed-by: weijun, wetmore

Merge

Merge

8023362: Don't allow soft-fail behavior if OCSP responder returns "unauthorized" Reviewed-by: vinnie, xuelei

5047859: (reflect) Class.getField can't find String[].length Reviewed-by: darcy, mchung

6815130: Intermittent ThreadMXBean/Locks.java test failure Summary: Preventing stale reads from ThreadExecutionSynchronizer.waiting flag Reviewed-by: dholmes, mchung, dfuchs

8024260: 10 closed/java/lang/invoke/* tests failing after overhaul to MethodHandleInfo Reviewed-by: vlivanov, briangoetz Contributed-by: john.r.rose@oracle.com

8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError Summary: Fix pre-existing 292 bug tickled by combo of nashorn code and MethodHandleInfo changes Reviewed-by: jrose Contributed-by: vladimir.x.ivanov@oracle.com

8023943: Method description fix for String.toLower/UpperCase() methods Reviewed-by: okutsu

8004179: Few of test/java/lang/management/ThreadMXBean/* tests don't clean up the created threads Summary: Just run those tests in "othervm" mode. Reviewed-by: alanb, dfuchs, sjiang

8023464: test/closed/sun/tracing/ProviderProxyTest.java failing Summary: Don't rely on assertions when an Exception suits better Reviewed-by: alanb, dfuchs, sjiang

8020816: Metafactory crashes on code with method reference 8021050: MethodHandleInfo throws exception when method handle is to a method with @CallerSensitive Summary: Fixed by 8008688 - this is a test to confirm the above fixed Reviewed-by: vlivanov

7186632: NLS t13y issue on jar.properties file Summary: to remove the redundant backslash Reviewed-by: naoto

6341345: (spec) Console.reader() should make it clear that the reader requires line termination Summary: to clarify the spec Reviewed-by: alanb

8019853: Break logging and AWT circular dependency Summary: Break logging and AWT circular dependency, which was at the root cause for 8023258 - Logger.getLogger() after ImageIO.read() returns different logger instance Reviewed-by: mchung, art

6823527: java.util.logging.Handler has thread safety issues Reviewed-by: dholmes, mchung

8008981: Deprecate SecurityManager checkTopLevelWindow, checkSystemClipboardAccess, checkAwtEventQueueAccess Reviewed-by: anthony, art, mchung

8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black) 8012913: LinkedHashMap key/value/entry spliterators should report ORDERED Reviewed-by: mduigou, forax, bchristi, alanb Contributed-by: Doug Lea <dl@cs.oswego.edu>, Paul Sandoz <paul.sandoz@oracle.com>

8024182: test/java/util/Arrays/SetAllTest.java fails to compile due to recent compiler changes Summary: Use explicit lambda due to javac simplfying rules for overload resolution with implicit lambdas Reviewed-by: alanb, mduigou

8008688: Make MethodHandleInfo public Summary: A major overhaul to MethodHandleInfo and method handles in general. Reviewed-by: vlivanov, twisti Contributed-by: john.r.rose@oracle.com

8024140: [TESTBUG] Profile based regression test groups for jdk repo Reviewed-by: alanb, chegar

8023997: j.l.String.join(java.lang.CharSequence, java.lang.Iterable) sample doesn't compile and is incorrect Reviewed-by: alanb

8017195: Introduce option to setKeepAlive parameter on CORBA sockets Reviewed-by: chegar, msheppar

8017513: Support for closeable streams 8022237: j.u.s.BaseStream.onClose() has an issue in implementation or requires spec clarification 8022572: Same exception instances thrown from j.u.stream.Stream.onClose() handlers are not listed as suppressed Summary: BaseStream implements AutoCloseable; Remove CloseableStream and DelegatingStream Reviewed-by: alanb, mduigou, psandoz Contributed-by: brian.goetz@oracle.com

8024178: Difference in Stream.collect(Collector) methods located in jdk8 and jdk8-lambda repos Reviewed-by: mduigou

8022176: Weaken contract of java.lang.AutoCloseable Reviewed-by: alanb, martin, mduigou, psandoz Contributed-by: brian.goetz@oracle.com

8024015: TEST.groups: move jdk/lambda tests from jdk_other to jdk_lang Reviewed-by: alanb, mchung

7172176: java/jconsole test/sun/tools/jconsole/ImmutableResourceTest.sh failing Reviewed-by: mchung, mfang

8016127: NLS: logging.properties translatability recommendation 8024131: Issues with cached localizedLevelName in java.util.logging.Level Summary: This fix updates logging.properties resource bundles to follow internationalization guidelines. It also fixes a caching issue with localizedLevelName. The regression test that was added needs both fixes to pass. Reviewed-by: mchung, alanb

8024103: AtomicLongArray getAndAccumulate/accumulateAndGet have int type for new value arg Reviewed-by: alanb, psandoz

8024068: sun/security/ssl/javax/net/ssl/ServerName/IllegalSNIName.java fails Reviewed-by: weijun

8023765: Improve MaxPathLength.java testcase and reduce its test load 7160013: java/io/File/MaxPathLength.java fails Reviewed-by: alanb

6566891: RMIConnector: map value referencing map key in WeakHashMap prevents map entry to be removed Reviewed-by: egahlin, jbachorik, dfuchs, dholmes

8023881: IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode in IDN.toASCII Reviewed-by: michaelm

Merge

8024697: Fix for 8020983 causes Xcheck:jni warnings Reviewed-by: prr, jchen

8024511: Crash during color profile destruction Reviewed-by: vadim, prr

Merge

8024261: xrender: improve performance of small fillRect operations Reviewed-by: prr, bae

7159455: Nimbus scrollbar rendering glitch with xrender enabled on i945GM Reviewed-by: prr, bae

7043064: sun/java2d/cmm/ tests failed against RI b141 & b138-nightly Reviewed-by: prr, vadim

7189452: XRender pipeline does ignore source-surface offset for text rendering Reviewed-by: prr, bae

4673406: RFE: Java Printing: Provide a way to display win32 printer driver's dialog Reviewed-by: jgodinez, bae

8017469: [macosx] Printing problem using ja and zh_CN locales Reviewed-by: prr, jchen

Merge

8023052: JVM crash in native layout Reviewed-by: bae, prr

Added tag jdk8-b107 for changeset 55dd1a0fe510

Merge

Added tag hs25-b50 for changeset 8292c62817e4

Merge

Merge

8010941: MinJumpTableSize is set to 18, investigate if that's still optimal Summary: Lowered the MinJumpTableSize for each platform Reviewed-by: kvn

Merge

8001107: @Stable annotation for constant folding of lazily evaluated variables Reviewed-by: rbackman, twisti, kvn Contributed-by: john.r.rose@oracle.com, vladimir.x.ivanov@oracle.com

8024473: Remove unused macro: IRT_ENTRY_FOR_NMETHOD Summary: Removed unused macro Reviewed-by: kvn, adlertz

Merge

8012447: Java CTW implementation Reviewed-by: vlivanov, kvn, twisti

8024258: new hotspot build - hs25-b50 Reviewed-by: jcoomes

Added tag jdk8-b107 for changeset c86a71fcceaf

8024849: Don't remove upper case letters from username when setting USER_RELEASE_SUFFIX Reviewed-by: erikj

8024815: Make --with-dxsdk and friends deprecated Reviewed-by: erikj

Merge

Merge

8024665: Move open changes for JDK-8020411 to closed source Reviewed-by: erikj

8024620: config.log does not end up in corresponding configuration Reviewed-by: erikj

8008022: Upgrade Direct X SDK used to build JDK Reviewed-by: erikj, prr, ihse

8010185: Build should support --with-override-nashorn Reviewed-by: erikj

8024467: Update autoconf-config.guess to autoconf 2.69 Reviewed-by: erikj

Merge

8024201: Update bugdatabase url Reviewed-by: wetmore

Merge

8024200: handle hg wrapper with space after #! Reviewed-by: tbell

Added tag jdk8-b107 for changeset 2c525ed65d4c

Added tag jdk8-b107 for changeset 892889f44575

Merge

Merge

Added tag jdk8-b106 for changeset fa7b69611589

Merge

Added tag jdk8-b106 for changeset 2f514eb96d97

Merge

Added tag jdk8-b106 for changeset dabbe0edf55c

Merge

Added tag jdk8-b106 for changeset 6ba209076a37

Merge

Added tag jdk8-b106 for changeset e80e02865308

Merge

8024515: ProblemList.txt updates to exclude tests that fail with hs25-b49 Reviewed-by: alanb, chegar

Added tag jdk8-b106 for changeset 347df39afea6

Merge

Added tag hs25-b49 for changeset 20a700f38686

Merge

Merge

Merge

8013938: Native OOME on fastdebug VM on Solaris Reviewed-by: azeemj, brutisso, kvn, tschatzl

8020692: TestGCEventMixed.java failed because of timestamp in event after end event Reviewed-by: mgerdin, stefank

8019902: G1: Use the average heap size rather than the minimum heap size to calculate the region size Reviewed-by: tonyp, tschatzl, sjohanss

Merge

8016155: SIGBUS when running Kitchensink with ParallelScavenge and ParallelOld Summary: When using NUMA and large pages we need to ease the requirement on which node the memory should be allocated on. To avoid the SIGBUS we now use the memory policy MPOL_PREFERRED, which prefers a certain node, instead of MPOL_BIND, which requires a certain node. Reviewed-by: jmasa, pliden Contributed-by: stefan.johansson@oracle.com

Merge

8024095: Missing brackets in local scheduling code. Summary: Added brackets for if-statement Reviewed-by: kvn, roland

Merge

Merge

8023988: Move local scheduling of nodes to the CFG creation and code motion phase (PhaseCFG) Summary: Moved local scheduling code from class Block to class PhaseCFG Reviewed-by: kvn, roland

8023976: assert(!CompilationPolicy::can_be_compiled(this, comp_level)) failed: sanity check Reviewed-by: kvn, twisti

8023597: Optimize G1 barriers code for unsafe load_store Summary: Avoid loading old values in G1 pre-barriers for inlined unsafe load_store nodes. Reviewed-by: kvn, tonyp Contributed-by: Martin Doerr <martin.doerr@sap.com>

Merge

8023691: Create interface for nodes in class Block Summary: Create public methods for accessing the nodes in a block Reviewed-by: kvn, roland

Merge

8022283: Assertion failed: assert(is_loaded() && field->holder()->is_loaded() && klass()->is_subclass_of (field->holder())) failed: invalid access Reviewed-by: roland, twisti

Merge

8022595: JSR292: deadlock during class loading of MethodHandles, MethodHandleImpl & MethodHandleNatives Reviewed-by: kvn, coleenp, dholmes

8022456: LogCompilation tool does not work with C1 output again Reviewed-by: kvn

8016277: Crash in nmethod::is_compiled_by_c1() on x86 Summary: Method pointer for zombie methods may be invalid Reviewed-by: kvn, coleenp

7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked Summary: Do patching rather bailing out for unlinked call with appendix Reviewed-by: twisti, kvn

8023472: C2 optimization breaks with G1 Summary: set control edge for previous value load in G1 pre-barrier Reviewed-by: twisti

8012972: Incremental Inlining should support scalar replaced object in debug info Summary: store in _first_index not absolute index but an index relative to the last (youngest) jvms->_scloff value Reviewed-by: roland, twisti

8023381: VM fails to initialize in runtime/CDSCompressedKPtrs/XShareAuto.java runtime/SharedArchiveFile/CdsSameObjectAlignment.java Summary: Improve handling when CDS archive cannot be mapped Reviewed-by: kvn, dholmes, mseledtsov

Merge

Merge

8023872: Verification error in generated lambda classes Summary: skip verification for generated lambda classes Reviewed-by: kamg, dholmes

Merge

Merge

8024050: Incorrect optimization level and comment specified for unsafe.cpp Summary: Fix comments and optimization level. Reviewed-by: rdurbin, coleenp, hseigel Contributed-by: lois.foltan@oracle.com

Merge

Merge

6991327: using -Xprof trigger native memory leak Summary: Fixed a memory leak in FlatProfiler::record_thread_tick() method Reviewed-by: dholmes, ccheung

Merge

8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced Summary: declare all user-defined operator new()s within Hotspot code with the empty throw() exception specification Reviewed-by: coleenp, twisti, dholmes, hseigel, dcubed, kvn, ccheung Contributed-by: lois.foltan@oracle.com

Merge

8009062: poor performance of JNI AttachCurrentThread after fix for 7017193 Summary: don't re-evaluate stack bounds for main thread before install guard page Reviewed-by: coleenp, dholmes, dlong

8022407: sun/misc/CopyMemory.java fails with SIGSEGV in Unsafe_SetByte+0x35 Summary: lower optimization level for unsafe.cpp due to MacOS Xcode 4.6.2 compiler optimization issue. Reviewed-by: coleenp, twisti, dholmes Contributed-by: lois.foltan@oracle.com

8016764: JVM does not prohibit invokespecial in c.f.v 51.0 that invokes default interface method in c.f.v 52.0 Summary: Check cfv before allowing invokespecial call to default method. Reviewed-by: kamg, acorn, dholmes

8023720: (hotspot) setjmp/longjmp changes the process signal mask on OS X Reviewed-by: dholmes, rbackman

8020489: VM crash when non-existent interface called by invokespecial Reviewed-by: kamg, coleenp

Merge

Merge

8020622: create.bat on Windows failed to create project file for Visual Studio 2012 Summary: Treat VS2012 the same as VS2010. Reviewed-by: dcubed, kamg, minqi

Merge

8020675: invalid jar file in the bootclasspath could lead to jvm fatal error Summary: removed offending EXCEPTION_MARK calls and code cleanup Reviewed-by: dholmes, iklam, coleenp, mseledtsov

Merge

8023477: Invalid CP index when reading ConstantPool. Summary: Need to check for 0 case for InstanceKlass::_generic_signature_index. Reviewed-by: sspitsyn, sla

Merge

8012294: remove generic handling for default methods Reviewed-by: kamg, coleenp

Merge

8023638: Add the regression test for 8006997 Summary: Add the relevant test and proofread the VM messages as well Reviewed-by: coleenp, mseledtsov, dcubed

8024022: new hotspot build - hs25-b49 Reviewed-by: jcoomes

Added tag jdk8-b106 for changeset a9ef5fb72167

8024320: Add s390(x) detection to platform.m4 Reviewed-by: erikj, ihse, dsamersoff

Added tag jdk8-b106 for changeset 8b941e6b5552

Added tag jdk8-b106 for changeset 514b0b69fb96

Merge

Merge

Merge

8022744: javac -Xpkginfo command's documentation is sparse Reviewed-by: darcy

8013384: Potential infinite loop in javadoc Reviewed-by: darcy

8023522: tools/javac/tree/TypeAnnotationsPretty.java test cases with @TA newline fail on windows only Reviewed-by: darcy

8001669: javadoc internal DocletAbortException should set cause when appropriate Reviewed-by: darcy

8010310: [javadoc] Error processing sources with -private Reviewed-by: vromero, mcimadamore

8014566: Remove @ignore tags from MethodReference66 and InInterface when 8013875 is fixed Reviewed-by: briangoetz, jjg

8023826: Typo in warning about obsolete source / target values Reviewed-by: jjg, wmdietl

7052170: javadoc -charset option generates wrong meta tag Reviewed-by: jjg

Merge

Merge

8023768: Use the unannotatedType in cyclicity checks. Reviewed-by: jjg Contributed-by: wdietl@gmail.com

8023701: Fix badly named test Reviewed-by: bpatel

8022173: Relax some warnings in doclint Reviewed-by: darcy

8020745: Suspicious MethodParameters attribute generated for local classes capturing local variables Summary: Corrected an error in a previous patch that caused captured locals to be added to the beginning, not the end of a parameter list. Reviewed-by: jjg, mcimadamore, ksrini, abuckley

8023112: javac should not use lazy constant evaluation approach for method references Reviewed-by: jjg, mcimadamore

8022316: Generic throws, overriding and method reference Reviewed-by: jjg, mcimadamore

8023520: Add missing test for JDK-7118412 Summary: The test for JDK-7118412 was dropped from the changeset in a merging accident. Reviewed-by: jjg

8022287: javac.sym.Profiles uses a static Map when it should not Reviewed-by: ksrini

7118412: Shadowing of type-variables vs. member types 4987840: What is the scope of an annotation? Summary: Fixed issue with shadowing of type names. Reviewed-by: jjg, abuckley, mcimadamore

8023515: import type-annotations updates Reviewed-by: jjg Contributed-by: wdietl@gmail.com