Merge "Fixing build breakage due to misnamed javadoc variable."