Android 4.2.1 release 1.1
Merge "Fixed Maps.java comment to reflect current code"