Merge "Fix script after image changes." am: a0d26f6428
am: 9b718ec18a

* commit '9b718ec18ad77dced4601363082b6c1e8a0e8fcb':
  Fix script after image changes.