Merge "Modifying test to exclude automotive specific classes if running in non-automotive build."