Merge "Clean up OatFileAssistant getting of image info."