Merge pull request #1 from ratecity/merge-upstream

Merge google_dfp upstream
Remove plural on Tag
Merge pull request #2 from ratecity/merge-upstream

Remove plural on Tag
Merge