Refactor SprintQuery

Change-Id: Iea00ebb400bdde82d26fc58b871ffab57cd07e7e
Merge remote-tracking branch 'upstream/master'