Tested to 4.0 Keyword Update

git-svn-id: https://plugins.svn.wordpress.org/google/trunk@980547 b8457f37-d9ea-0310-8a92-e5e31aec5664