Merge "Fix google3 "java code clarity" issue" into rvc-qpr-dev