Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am:...
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870ac am: 56cb5bf9 am: 4ca111e9 am: 0a46e79b
Change-Id: I0b5a158fb686dca4c25d27e03200a7eebc1df497