misc diamond hosts who do not use standard

Change-Id: I05b239caf8b60b443bcdfca25a2afeaaf8d15d10