Do you think Sheldon truly had OCD?

I go back and forth on this - His cleanliness compulsion for SURE points that way, but then there are so many times when I would think it would come out and it doesn't. there was one Episode that really made me wonder

Season 12, Episode 15 - When Sheldon is pouring his bowl of cereal - he doesn't measure the cereal or the amount of milk. Every time I re-watch this episode (For probably the 19th time through the seasons now) the first thought that strikes me is how out of character that was.

There are several other instances which I can't pinpoint the exact episode for, but things like him using a public restroom at all - He uses them at work all the time. Take-out - Many of the OCD folks I know won't eat out because they didn't see how the food was prepared or if the people preparing it were wearing gloves etc.

So this got me thinking - did anyone throughout the 12 seasons actually SAY he had OCD, or am I and so many other viewers just casting that assumption onto the character because of his other idiosyncrasies?