Merge "Enable per-product tests"