Merge "Add LockSettingsStorage tests" into lmp-mr1-dev