Merge "Delete OverrideLog and cleanup includes (1/2)"