Surface Pro 2 Charging Issue at 85%

[ibenzawla]

Hi, So my Surface Pro 2 has this weird charging issue and I am wondering if someone here is familiar with it. It charges fine all the way to the 80% mark and then it starts switching from charging to not charging. This goes on till around 85% when it shows charging and then it stays that way till 100%. It seems to charge fine but the battery icon keeps changing between charging and not charging around the 80% mark. Seems like a driver issue and I have uninstalled and reinstalled the battery drivers but no luck. This happens both on Windows 8.1 and 10 Pro.