am 3e64b7ba: Merge "remove references to google apps"

* commit '3e64b7ba03c3efddd580f6099abd443a481fe1f5':
  remove references to google apps