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

* commit 'f2bd3cc9df7e6da3e5802edd3d028b6b4498bb26':
  Add LockSettingsStorage tests