Use capitalization for Image Service

Change-Id: I45e6f231a11607c2429ff7b4b941e242ba7fe7cf
Merge "Use capitalization for Image Service"