Merge "Improve wording of imageinfo API userid prop"