Android 4.2 release 1
Merge "Fixed Maps.java comment to reflect current code"