Merge "Update test expectation for no-image."
am: 53ac3130ed

Change-Id: I63a7d0e796ac24956bc65c96ccda3c409e3c2a2f