Plugins need to be adapted to import the classes from the new client package. Change-Id: I9c3533410fbfceebcdf4d7d899513d14ea1f0f34