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

* commit '4c8c759106eba4070a46393f2978607964881511':
  Update the comment in two APIs since we will persist the settings.