Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev