Merge "Update Location.convert() javadocs to reflect their inconsistency with locales."