CLC-3410 Ninth batch of reorg: Google and Notifications

https://jira.ets.berkeley.edu/jira/browse/CLC-3410