Merge "Update setLocationEnabled in DPM"