Merge "Fix privacy leaks in LocationManager" into mnc-dev