Minor improvement to AVD image.