Merge "Move image_meta_to_headers from images_client"