Homewood Suites (Hilton) has always had a nice group of products available for free and in their little shop in the lobby (always open). They are adding in both catagories. They have, in most locations, a shopping service for groceries and other items. In order to obtain what you really want (some of the shoppers are men), a photocopy of the container of the product would be a very handy thing to provide.
Local managers are trying to improve their ability to meet travelers' needs. If you telephone ahead, they will tell you what they have on hand.
Marriott is situational. I telephoned one south of Denver (Denver Tech Center) and got a very vague reply. I'll telephone again before I fly.