Merge commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e' * commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e': Add gservices flags for calendar sync.