Incorrect use of AMI_IMAGE instead of THIS_IMAGE
Updates upon merging with internal branch.