Merge "Deprecate checkNotNull in favor of Objects.requireNonNull()." am: 7b511f0dd8 am: 1e62d2dd40

Change-Id: I9493491cecb3c2308d961e167c276204587a7ce6