Merge "Fix image test with GSS"
am: de31ca6201

* commit 'de31ca62015e94016155a99a268ea798ab1ef75c':
  Fix image test with GSS