So I had the issue last week and took the car in. They gave the mass air flow sensor a good cleaning and told me it was fixed. So I take their word for it pay for it over the phone and pick the car up after hours Friday night. So after driving a few blocks I notice its still having the issue. Took it back on Monday since they aren't open at all on weekends. and they replaced a loose elbow joint near the MAP sensor.

This seems to have fixed it in my case.

Thanks for the feedback and hope this helps out someone else.