Merge "Rule out testcase 660 from no-image variant"