bug 872992 - clean up leo and hamachi hardcodes
Follow up to bug 872992 - Undo changes to gtest
Add support helix device.
Merge remote-tracking branch 'upstream/v1-train' into v1-train