Merge "MediaRouter2: Fix javadoc" into rvc-dev