Merge "remove references to google apps"