Merge "Correct Preconditions.checkNotNull usage."