Merge "Add test for multiple device matrices"
am: 2c58345742

Change-Id: Ia2b7b1e7e4edae0f9d1b4d6b0a6cb228bde7927f