Only merge after the ggp change has propogated to bare slave images. Change-Id: I8c88d09c7a311edf526cffc730afd4471895eeae