Revert "Add a new context for Google-authored apps"

This reverts commit 47ad8564f7c86396bf028cac02ba480c84621d2c.

Change-Id: I98916fe8597c07dd8c01214fe19549e7817df9c4