[Bug 822630] [contacts] Possible CSP problems
Merge pull request #7108 from jmcanterafonseca/csp_2

[Bug 822630] [contacts] Possible CSP problems
Auto-merge from branch 'master'