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

Change-Id: I42b5f3730d4ae3da871c8f36ba1630a2d0552af8