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

Change-Id: I1fc1508dae6df3f58c2bc0c55c51cbd95a457616