Hello,
Please provide your list of bugs that you are facing with your android application. I will check as let you know how much time it will take to resolved and also will check possible effect of the changes on other module or functionality.
Thank you for taking time to read about my proposal, looking forward to hear from you.
Best Regards,
Silvans