Adjusting and refactoring salt-formula for Queens

Change-Id: I059e8978e71a8dd12291465ac67a7eb2c4446c3d
4 files changed