Fix Package manager service

Change-Id: I9fa8776a49c89335b2e8368138230e369b81aa49