Merge "Fix LocationManagerTest#testLocationUpdates..." into gingerbread