Merge commit 'goog/readonly-p4-donut' into HEAD

Conflicts:
	location/java/android/location/Geocoder.java