Merge "Update Location Settings for Enterprise" into lmp-dev