fix syntax error in google conf.json
Merge branch 'develop'