am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev

* commit 'e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.