Get rid of eggs and gems everywhere except bootstrap image

Change-Id: I1986955b58a4095ab91fec4e589fc958ee3e0254
Merge "Get rid of eggs and gems everywhere except bootstrap image"