Merge "Add new DPM API for setting location enabled"