Merge "Fix the reno format of image-clients-as-library"