Merge "Rule out testcase 660 from no-image variant"
am: c512a0f896

Change-Id: I6d7419da5249660254a07e1f5b5a698a420db31a