SprintControllerTest

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