Merge "Add test for multiple device matrices"