Cleanup in Change classes

Change-Id: Id16fd7525c10715bf543e3194d431105b25cdc46
Merge "Cleanup in Change classes"