Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev am: 3bc533d22f
am: d8c513f075

Change-Id: I49bca6f5e34271ddd84e5e32f4b607cc8fe7ca74