Merge "Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev...
Merge "Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870ac am: 7ebc3308" into rvc-d1-dev-plus-aosp am: e4eebd0e am: c91360f0
Change-Id: I9064599f9a9243a31232a0fb47aa3bc50a23383e