Use Q_PORT variable rather than hardcoded port

Change-Id: I647c6bdf14f2551bd120821a16044cec2b03b197
closes-bug: 1348834
Merge "Use Q_PORT variable rather than hardcoded port"