Merge "Update Settings due to API changes." into lmp-dev