GPII-671: Added remaining android solution