Fix image set properties error

Change-Id: Ia290935c8a040221caf1a46ca29a7bb2e5df1ce6
Fix errant underscores

Change-Id: I71b8c8df14b85e3042220e3593a9732ee6cefe15
Merge "Fix errant underscores"
Merge "Fix image set properties error"