Merge "Remove oat file location in the image."