Merge "Revert "Add basic implementation of IsModifiableClass""