am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
automerge: 09fc10f

* commit '09fc10f18f6fac8d48e4a46a3a954c336f2bd8be':
  Add LockSettingsStorage tests