Add S4 family support (1/3)
Track CM Calendar Provider

For Privacy Guard support
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1