Make the google-edition specific changes specific to the google edition

Change-Id: I98e51701985ead35c5ba26496bdd19e257862a34