Merge "New strings required for Exchange calendar sync"