Merge "Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c5 am: 2f23e9d8 am: 1198679e" into rvc-qpr-dev-plus-aosp