Thanks a lot, Shlok, for all the changes. I have included the changes from topup.patch to my changes. 

I believe it handles all the review comments. Please take a look.

Regards,

Gyan