Make manifest gerrit friendly for repo upload

Change-Id: Ib830bf0b89c990338fdb7b5fca24856dbfd1528e