Merge "DO NOT MERGE: Fix NPE bug in LocationManager" into rvc-qpr-dev