Merge "Fix a calendar info query to use a constant instead of a string"