Merge "Changes SvcContext_t to SvcContext"