Merge "Fix testIncorrectContextUse_GetSystemService" into rvc-dev