Merge "Clarify type of EXTRA_DEVICE in javadoc" into rvc-dev