Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev