Now I wonder if they will also be included in the commitment for 4 ATP500 tournaments (if it is, Federer could count his points from Doha even if doesn't play Tokyo/Beijing for instance). It would be strange to me because they don't need an incentive to have players play the Olympics
The Olympics are not part of the commitment. One can demonstrate this by seeing that Roddick received a 0-point penalty for Washington, even if he played the Olympics the same week. That is because, Roddick needed all 3 remaining ATP 500 tournaments to fulfill his commitment. Monte Carlo is part of the commitment.