Merge "Fixed Maps.java comment to reflect current code"