Remove reference to 'calendar' for globe data type

Change-Id: I639922a82277fa0b1871178af3fcaa771bde07df
Merge "Remove reference to 'calendar' for globe data type"