Merge "no-image does not prebuild, so disable checker for this." am: ca333f4093
am: 267e1763a4

Change-Id: I0eaab5310ecf74587c423ed4eed65c3d00001086