Call query service for storage profile data and refactoring/updating unit test

Change-Id: I2a0528328ab74e6f9de68f6845fa62863aa844b3