Allow customizing classes inside of diffs

Not every implementation might want them

Change-Id: Id186b71760d59be7e61458bf1f62965a0f2f826c
Merge "Allow customizing classes inside of diffs"