pdroid related changes