do our changes here instead of in the manifest

Change-Id: If3c8dbbdde266da74aa2c665ab281284801432ae