Merge "Fix failing GameManagerServiceTests" into sc-qpr1-dev