LPS-50903 Apply similar ServiceContext usage to more places