replace indirect call the SR removal with a direct one (The indirect call via _core_plugin also works) Change-Id: Ie379cbda369f7d45818275294f10e05cb9a7ef3b