Make google edition specific changes google edition specific

Change-Id: I70a11aa18bf462a4a18410965367f5fcec6da157